fixes #2. A little choppier on the scroll, but hopefully cleaning up the DB accessing will help with that