fixing many bugs (angular 1.2 problems), need still some works