Cleaned up logging and gave the user some choices