continue fixing some bugs