misc span conditional statements changes and some more groundwork for colspan clones