Adds leader, %%, and fixes extraspace