Fixed Directory Issues and Cleaned up logging.