Various small fixes, adding new Types.