Updated a bunch of init stuff. Check the diff.