more bug fixes, comments, etc