Going through and checking what needs to be fixed, re-done