peer class and fixups