minor improvments ++