Added missing commas and renamed some. Closes #1