config changes and bugs fixed