Added further options, corrected README