some stuff are fixed, some not
Merge branch 'master' of github.com:jacomyal/lonely-voyage