fix quarter breakings, fix double code, add rowspans