Fixed a lot of the init function call