Remove unused generators, clarify the collect, add an eunit timeout and more commands.