New functionalities....and some fixes!