endless scroling some import improvements