Added some recent changes that Wyclif and I missed after copying over files