Some error checking and bug fixes
Add new tables to storage server