fixed some details in code
beauty changes