Third Commit

Some erros fixed. But many more detected.