Bug fixes. All original functionality seems to be working now with new
db schema that prepares for future pause capabilities.