Added some inits, cleanup.