added some print help
fixed merge conflicts