Cleanup, Tank fix, Bore update