fix some space issues