misc javascript + login working
fix map conflict