Moved some methods
fixed
corrected building