Final commit

(I don't quite remember what I did so just committing whatever that's left.)