added support for cbmc checking of hierarchical states + code improvements