Better MOTD handling
ugh