pref window indexing, misc changes