Fix & Small cleanup

Also added ItemType:getType()