Various corrections
Added fake sender