more small changes!