Feature/small tweaks

many small issues