fixes and config