still fixing bugs