tabs/spaces fixed; ro/rw stream fix; tests pass; explicit constructor removed; amalgamation; clean up;