Small changes made. Started a log of things to verify working. Will review major changes with Tuan before commiting.