thesis and packages and figure update