Improvements

see commits