Type boilerplate set up. Initial type tweaks