Modified files to make them work

Modified files while on the phone with Charles to get them to work.