numerous single hop and rhizome fixes