more demo and man changes