Update site, small refactoring