fixes for puck
Merge branch 'master' of github.com:dlwh/epic