Update my fork with all changes to date

Update my v1.6 files with all the latest changes.. (Hope I am doing this right..)