Cannon rework

modeled and UVed