clearing out some gunk and adding a catch for get_params