fixes, configuration