Correct DB location; minor cleanups