General Updates and bug fixes