fixed bugs

waiting for facebook part