Improved messages and timing