tiny improvments