Some little improvements have been implemented