Setting up properly
Little tweaks