Improvements

Template expansion, widespread unit addition, bugfix