long overdue commit, updates to views