debugged and made several changes to these files