06-03-13 tweaks and changes