Added demo config items
Code cleaning up