small changes - still working on things