Improvements and demo notebooks