Improvements, fixes and demo applications