Adding database stuff and grammar fixes