Bugfixes and development