fixes and add naming listener