healing and bug fixes