Some more changes, look in the diff since I don't remember.