A lot of changes from production

Signed-off-by: aljeks <alleksei@inbox.ru>