Some little improvements!