Improved controller with long options, fixed segm. fault