additional recommendations from Andrew Short

I have changed all the recommendations made by AJ Short