all demos completed, several bugs fixed