All compiler errors fixed (for now......)