a few more changes to hmm structure