heroku behaves differently from local, trying to fix
heroku behaves differently from local, trying to fix2
fix some visual glitches with ugly timeouts