poking around – minor patches