More updates, stuff is working