lazyLoader and other improvements