commit current work on options and configuration handling