Many bugs #fixed

https://media.gleasonator.com/d99f7bcee58621873599a34a6fd4222760641d8bccc88ba5940e20d080b6a3ab.mp4