added freeze support, cleaned up parallel a bit.