made some changes to bring files up to date
probably all for not, expecting giant mess when merging
upstream changes