Small fixes, new demo message