Changed getting of params; Removed some logging