Removed commas from a join, fixed a bug