error handling figured out. Fixed some tables