Fix, improve, optimize

[mikotalik]

This version should work out of the box. Just "yarn upgrade && yarn install && yarn start"