Comments, bugfixes, other stuff