fix travis tests (more), minor comment edits