Fixed ximTOUR and minor errors