Fixed some bugs, did some testing, moved some procs around for robot functionality.