Rain Bug and others improvements