bug fixes and more comments