General updates

general overall updates to most/all files