various fixes and local rule activate toggle