quick copy and bug fixes