fixed some logic and organization problems
cleanup in README