rightlist fixes and cleanup