fixing comma issue
lots of fixes