Fixed issue with extra comma, and missing semicolons