Improved figures & added several selectable options.