Yet another update

Signicifant changes and clarification to the code