Minor update and bug fix