added new types and minor misc changes