jumpy and animationy fixes