improvments after some tests
improvments from live tests