Wallclock snapping is complete, tweaked a few command-line args