made some functions specific to DiracStates, clarified typemap