fixes for additional comma and missing semicolons