Bugfixes and code reading.