added dictionary plus various fixes