cleaning project + demos improved