Fixed a bunch or problems with the model
Cleaned up variable neames and fixed logisitc approximation of the normal distribution