Update comments, fixed crash.