Tune a bit, fix a bug