General touches. Adds some more member work.