FInaly little tweaks