add upstream code

i.e. PeaceKeeper and Weekend

Also a few formatting tweaks.