Adding a few more tweaks