Performance improvements (fixed)

Progress in the direction of #87, especially on mobile.
This version doesn't break everything for new users.