streamlined MOTD, fixed espwh merge issues