Improved hints and messaging.