Init (still). General clean up.