fix contracts and priorities on registration
more contract fixes
entity annotations, has entity, head fixes
Merge pull request #306 from patriot1burke/master

fixes