hotfix.1.0.1

Bug fixes and enhancements.