hint + small fixs