Issues 434 435 and some other stuff

Fixes #434
Fixes #435