Fixes for lag and new images