Modified solve6, solve7, tweaked random things.