updates to website and cleanups
more fixes
merge