s
-fixes after demo #1