Database Update and Tool Fixes