Added handlers, fixed some snafus in Subnet