commented out/deleted some old code, proper github uname and email for commits