just a couple changes, more tomorrow :)