Tweaks and Fixes
Made name def more name definitiony