rolled back some bad changes, made export with border work