More updates. Hopefully this won't mess things up :P