bug fixes after demo