Feature/minor tweaks