Improvements + basic demo