Add city, state and description vars. Fix #3 and fix #7