WRoute comments improved and fixed