added demos and some quick fixes