comments / fixes