Almost all @anserran comments addressed