Fixiing some Erros