big cleanup on table methods and column matching