lots of changes & facebook login works