new functionalities, some fixs