comments and various fixes