Main: Add -s option to allow logging to console as before