minor fixes and renamerd user to sender