Got rid of the DynamicParameters
and a bunch of small bug fixes