more neighbor fixes, and error catching
Merge branch 'master' of https://github.com/zackm/CS184_Final_Project
merge