minor improvememnts