Added some suggestions from Hugo