clean up bugs