finished demo quality
merge issues