Bugfixes and small comment updates