Added reverse lookups to dict.h, fixed filename shadowing issue