Polish
Bugfixes Done