Pushed most recent for Joost :-)

Contains a lot of fixes for... things?