changed SITE_SETTINGS, removed cruft, added misc stuff