Many bugs fixed and to be fixed!