Updated Files

Updated Files - debugged and fixed
Debug - reupdated

Updated files and completed debug