Firefox and Safari ready, fixes #18, fixes #17