Minor bug fix to CF acro mode, and making it compile in and be selectable.  Warning: Untested!