Bugs fixed, composite demo added