Change undefined equality to typeof
Fixing bugs
met
come on
did stuff
Fixed merge problems