Some little improvements done