comments and other fixes