Expanded controls. Closes #125.