Added motd to configs. Some code cleanup