merge, small changes to ball, model, table, main