some changes I made a while back and never comitted