Bugfixes & Linting