cleaned up traces and fixed a few minor issues (hole positions)