Post-vacation filedump

too many changes to mention B)