fixes demo and type adjustment