Cleanups, added manual test site