Fixed water_normals. switched to clang. housekeeping