Added:
	* Cannon and Tube buildings/tools
Code clean-up