Minor config changes, added inline storage units