DF-2765 some small fixes, loopLayer rethought