Made Changes Mr Steinborn suggested

Some Changes Mr Steinborn suggested