slight changes

Nearly finisched work