Added base class picking mechanism

Bugfixes:
-fixed salvaging a mine removing double the building income