multiple fixes and modifications for new user configs