changes made and improvments, still working in on something