chore: Addressing small fixes and typos