Fix many bugs (still exists)