added some more comments and options