Fixed lazy evaluated functions, but there is still much work to be done