improved some stuff in Demo 2
adjusted some stuff in demo3
refactored demo 4 a little bit