Minor formatting changes to driver
misc
Add interoperability with store
Remove syntax errors