fixing things I broke with refactor, still more needed, grabbing changes from aaron
merges, sowow