more refactor
tracking down some last bugs
lastt bugs, docs, and a screenshot