Comments, minor bug fixes