Updated correctness
Completed a few problems