Adjusted default config
Various important bug fixes and optimizations