Added option for multiple choice gaps. Minor fixes for simple gaps.