Bugfixes + Improvement