Fixing Formatting and adding options