Fix shot startpoint
Various 030 changes
Final 030 Changes