clean + small fixes