lots of entry code changes
Merge branch 'master' of https://github.com/danhan/hcat-savi