changed output and added support for border-width