07.29.13 minor fixes before branching