cleaned up tryPickup and error conventions
Merge branch 'master' of https://github.com/JayH5/hons-simulator

merge into local