Fixed acceptance bug, made a few parameters easily tunable