fixing some bugs
fixing some bugs