type
Misc additions and changes