add comments and other basic stuff