fully responsible

all minor fixes