just fixing some bugs