Paste refinements

Updated paste zones and bug fixes