Suggestions

I've improved everything as I think it's best. No guarantees :grin: