More authentication, added bootstrap