cleaning up some parameters
Updated docs