Did more stresstests, updated TODO