minor changes and fixes
null concept fix