Improvements to lazy eval and documentation