Quick Updates

Fix some DB scripting so things won't err if you have hyphens and such in database names.