more tweaks T_T