Changed some argument names for hyperparams to make it clearer what it actually is (e.g. hyplik instead of just hyp, which is a dict).