change stuff according to suggestions in #707