Tweaks to freeze/thaw
Add space after waiting message