Added some more headers

and also learned the difference between certain instantiations.