some fixes and comments