Closed #12, closed #1; additional columns in DB