Hey PK I've made the changes and tried to improve the quality of the analysis. Although, I have a few questions that I edited on the response to your post.
Sorry for the 2 days dealy, but i finally made it: http://pastebin.com/BaMZ4LEz. The OO section is missing because it didn't need any change so you can just keep the one that already exists. Just make sure to give to the analysis one more GP check as i edited a lot of stuff...