adapted documentation and decreased todo :-)