Feature/guitweaks