consolidated, minor refactoring for personal style guides, updated control/readme/etc for fork