yosimited tweaks and fixes