Last changes from pon4ik
Fixed some errors
Last changes