And update the instructions
Fix some more stuff