Most of @anserran comments' addressed