Bugfixes and additional features added