better loading feedback, minor changes