add more type annotations on the easy ones