Bugfixes and start of source