Improve synopsis and check options