Tweaks and fixes

See the video