Update and bug fixes