Fix many many thing...broke less.