fixes and correctness stuff.