Fixed some issues and added prefs for echo