fixe issues and improvements