Merge "Add better status messages"