Bugfixes && additions