added gmp and further cleaning