updates to everything

fixed major bug in code, now model looks awful. need to find new
estimates for most parameters.