fixed upstream bug, added some hidden settings (not yet implemented)