touched up auth
updated map, code cleanup
merge