More updates and stuff