Resolved some errors and tested