minor fixes after demo