Burg Wimmel: Refactoring + Bugfixes

Refactoring Smaller bugfixes