find and fix bugs