PrimitiveHouse added and also some corrections