comment cleanup, and offline message fix