Various bug fixes and comments