Fixed init issue, added some stuff.