comments and build fix