lazy references fully integrated; code has been cleaned;