Adding service callbacks, some cleanup
pesky disk.db