Added more prefs, options page; change interface