Fix many bugs one more