db tables seem to all be good now