fixing minor issues, utilizing options