correctness stuff
merged