more small improvments