Looks OK.
Made, like, a bunch of changes. Sorry :|