fixed minor bugs, updated db, complted all testing