More optimizations for old browsers – resolves #97

Resolves #97 but also fixes some bugs.