message fixed (hopefully)

message fixed (hopefully)
merge fix
ok
awake fix