Simplifying the parameter objects.  Fixing some doc strings.