Fixed Most of Errors