Fixed Erros As Much As I Could