updated some files to match project

updated methods and classes.