adding the header
adding some more references everywhere to make things consistent
some more stuff