moar typos. Also, significant improvements when dealing with a large database