final changes to (hopefully) get site working after code reorg