Improvments

see commits