Forgot a file. Whoops. Also, some small fixes.