Added BoxWidth and BoxHeight

Small tweaks for some Swap methods too.