[de] add new rule (im -> ihm) that had been commented out
[de] fix or clean up some TODOs that are outdated or simply not that useful