added some additional forgotten changes.