fix some issues with spacing