Add a few extra thoughts and changes