fixed almost everything for demo