fixing some bugs
fixing bugs