Minor fixes and partial Facebook login