Revert "Revert "много всяких фиксов""

This reverts commit f77d23efdb848857d8438b4527c14302954ebb80.