Fix comment
Fix missing coma
Update with newest compiler warnings