Table problems fixed, etc.