Add comments, small changes