applied seraphers proposed fixes & suggestions