Added some misc. uncommitted changes that escaped old commits.