updates: from upstream

reminder: add docs, ask the guys over at school to make updates to the
wwwroot folder.