Add fixes to partial and refactoring

Исправил оишбки.