nearly complete Graphics & some changes for tests