Added more data pathing, and error logging.