bugs fixed,less to fix