debbuging

Some small bugs has been fixed