lots of fixes and improved copy