Revert "small bug fixes"

This reverts commit e4be0a717c70b3260c8d8488adea9f80956ed676.
Revert "Revert "small bug fixes""

This reverts commit c48deb97d30fe9c78fb467989d44c992c045e08e.
Merge pull request #1 from rolfkuipers/test

Test