Milestone 1 0 fixes

Fixes some open issues (or parts of them) towards our first milestone release.