I gang

additional small fixes