One goal for compositions in major key, one in minor. Made things a bit easier in code, but should probably unify them again to improve compatibility with original apopcaleaps.