Improved Q/timestamp tool some more