Updates to many places - things work better now
Merge branch 'master' of https://github.com/jchang-bcp/eros