fixed small issues after demo