Fix some issues
Merge branch 'master' of github.com:apanda/pilo-simulations