Added some tweaks