Fixes and changes for Chapter 2 of diplom work