Update base version, minor improvements like removing shadowing and

adding missing type declarations