Fixed building, added comments