More updates and bug fixes