Adding comments, fixing it up