Fixed clarity. Added some missing elements.