Fixed more problems, and found servo issues
Merge branch 'master' of github.com:Patosai/Goldilocks