Huge cleanup. Spray-type cannon implemented.