More cleanup
have the init compiling
take care of wanings