Bunch of tweaking!

+Fixing
+Few additions