Fixed a few bugs and included config control over new features