Couple of minor changes

Should be finished now