conver to lambda
improve null handling
Add the lead limit.
Make the property window v scroll properly