Re-order options and comment out those not implemented, update readme