fixes and config changes