many tests passing, todo cleanup and checks, other things, clarity