fixed commas, naming, map loop...