RPL corrections

Work in progress.