Updated wrong references
Fixed small mistakes