Started tidying up types. Handle uninit variables. Found a case which causes big problems.