fix'd

I cleaned up some trivial stuff here and there for correctness.