- Fix many bugs, delete some res not used yet