More bug fixes: recombination works fully now