Cleaned up output a bit, added more suttle fallbacks if config options is missing