add comments and other things