Implemented the new settings. Bugs might still be present. So it needs testing.