More updates fixes and stuff