more changes & some cleanup