Options Fix

Cleaned up the Options