fixing bugs step1
All bugs fixed