some bug fixes for missing commas and changed method parameter names