Test and fix macro expansion
minor corrections (rem timeout + pad rand)
Don't merge on width/height if id differs (or opposite)