some additional small changes