Final fixes for diplom project