Minor fixes and enhancements

Minor fixes and enhancements after 1.0.0