some additional small improvements