Facebook: Various improvements - moved some code - made some code obsolete - tested some code - etc.