Fixed fucking merge, but here some new bugs

Look at VK.