License
demo and some feature corrections