Also, documentation adjusted!