various fixes and comments