final bug fixes and demo config file in place