stumble support + minor clean up