Updated the debug statments and changed some method names.