Fix many bugs
Fix many bugs