Fix many many bugs :)

Fix many many bugs :)