commiting after bug fixes
Merge branch 'jakers' into assignment-lookup-fix