Added map, improved logon garbage