cleaned up options and help test