More little fixes and changed default benchmark