first pass at fixing dimensionality, now replaced by changes to multiple_uncertainty
cleanup
adding annotations