Maps and categories

Maps,categories and FB modules are merged and final comments are added
indent the code