Added some missing types. Fixed compiler errors. Added many WIC types.