rename and misc stuff