sorted and cleaned up resource ids
updated TODO file with more bugs