A Few basic tweaks