Replaced wfMsg() calls with wfMessage(), improved comments

Change-Id: I107e7d9a224310a669bb670a2d0822b05286de5c