fixes after the demo
more fixes