Cleaned up variable names, made extension field type options work.