Fixed some bugs

conflicting commits with arp handle