Bug fixes and added comma