remove prints, finish issue #94, issue #95