Small bug fix (get was using set functionality)
demo + some fixes