full with added whoami.htm and further changes