Changed parameters for Genome and fixed some code