websites, some tests, indent cleanup