Feature/tweaks