Fixed up all the crazy github issues (from the fitness function)