Adjustments & Bugfixes