added more params
fixed qps
more edits