Add buildings, gunstore, bases, markers again

just isnt 'our' version without them