fixed wolff algorithm
cleanup