function rename and small enhancements