Cleanup with commas, and update forex lib