Bugfixes and source formatting.