demo update + fixes