Fix instantiation and some tikz stuff