Made some more changes; added redeclaration, invalid-conversion