Various Fixes around

Fixes #42

Also some custom fixes