added roof
added inner triangle
some refactoring