More GA code, input cleanup