Special types are now case-insensitive
Added some TODOs