It looks like you've done nice work clearing your pool. You are apparently gaining a good grasp of the issues and acting on them correctly.

Just a cautionary note on your chlorine levels....40ppm could be endangering your liner....perhaps causing it to fade. If you need to shock in the future, I think you would do better to make your target Chlorine about 25-30ppm.