Model revisions to fix critical flaws

Version 0.2 of the model