bug fixed, new options.