Fixed start/end events, added necessary update-buffer calls