correct few bugs in the demonstrator
some basic tuning