Edited Code for Changes that had to be made

All of the changes that have been made to the code the past couple of
days.