checkin some changes

but need to be finished up before working