commiting for today
a couple changes...