weekly update 2

A lot of changes.