all changes @bblay suggested done