update on comments #117 and live edit #105