enhance reverse engineering

This should go into a ticket, not TODO comments