big overhaul and cleanup and french version update