Minor update and changes