Updates and bug fixes