Minor Changes & Bugfixes