Many bugs fixed and many bugs added