Added Additional Stuff

As well as umbrella tweaking