style updates in comments, few fixes