still fixing some bugs