Little edits
Merge branch 'master' of https://github.com/streppneumo/isp
Clean ups

Fixed some errors in code; still trying to figure out importing things
(errors come up)