Multiple fixes and additions

see commit messages :)