addressing all @wasade comments