cleaned up table/row stuff
shortened constructors