update files from my current setup, copy some more files from @andyfowler