Bugfixes Round 1

Many small fixes and changes