Minor changes in demos and main class API