-- ARP fixes - tab, rename, member var visibility