various tweaks by xpaum