rename and some more updates