fixed all space issues