Added rest of my buildings, small bugfixes