Final commit

Oops, never committed the final changes. Here they are!