fixes and updates from version 1.0.3