phase2, details incl'd in push
update
bug fixes
Merge pull request #1 from mankintong/phase2

Phase2