Things work
Continues to work --many warning messages removed
Remove some just in time evalaution that is not needed.
Localize some variables
More cleanup