Added Nada's changes + a few of my own...