added what-face function, misc cleanup