lint check, a few syntax fixes