Another 2 bug fixes & some commenting on the bugs