Fixed many errors, still some errors left