Cleaned up references and absolute paths