Moved around variable assignment locations in autonomous
Edited some variables