add additional buffer, work on demos, other fixes