Merge pull request #39 from pstephen43/master

sync up
added 5th start point
more cleanup work
fixing some hard to find issues
merging files
Merge pull request #23 from pstephen43/master

sync up