Minor updates and fixes. Updates 29102013

Minor updates and fixes. Updates 29102013