Improvements

as stated in commit-messages…