Big ones here: Better detection of Username and file type detection