Reloading items when reloading documents.
Cleaned up some TODOs.
Merge branch 'master' into website