Adding mailcatcher smtp and making some fixes