Assorted code added.