Feature/issue 292 manual fixes 2.0.1

this should be ready to go