more core improvments + fixed images