Some small changes, I think 'from is not an object' is an error in Mozilla's part