cleanup, docs, input concept extended