Numerous fixes

This is the version I will use for the video.
Various fixes