more changes

still working out kinks