minor changes, achieved much smoother initial loading of app.