Develop

fixed the 3 bugs that zach mentioned in his email