free some never deallocated buffers (thank you @H95518)
merge back the Demo application