Done revisions you ask above for your consideration, and added new ones please check them: 1st - #156 | #157 2nd - #159 | #160 3rd - #161 | #162 4th - #163
Let me know what do you think of them. If you need changes just let me know please. I will be back later and can work on changes if you need, feel free.