several Fixes