Bug Fixes & DB Update Key Change