added fixes and probably broke stuff
Merge branch 'master' of github.com:foresterh/marvin