More updates and random fixes