minor fixes
I like the proposal, look at it again