Add comments, a few fixes