some fixes, some breaks, moving to lambda expression edition
some fixes, some breaks, moving to lambda expression edition