clean some crap, make other stuff uglier, but a much nicer demo