fixing some typos, comment out db for now