Advanced options

Make some minor copyediting and bug fixing.