Enhancements 

Now as one PR. 

lol wrong auto-corrected branch name ;)