small changes around instructions and options