tables done, other changes