tweak the shovey sql a little
Beat some timestamp handling about the head and shoulders