A lot of small changes for efficiency. 
Tank size no longer hard coded.