better default keys; add automatic end stamp