Bughunting and changes to test stuff
Improvements towards Center-Performance