Blarg. Um, fixed somethings here and there.