bugfixes

 no blocker fixes included  but some annoing ones less :D