Minor fixes and added demos