fixed RT, minor tweaks