clean up bugs, testing