changes and fixes of last bugs