skills improvements

see commit comments