added long options and rid some end of line spaces