updated with all debugging from video; cleared unused code chunks and cleaned comments to match final_dev branch
merging