Improved Q/timestamp tool and docs