added support for constants of integration; code cleanup w.r.t. units_allowed