stuffs, changes and fixes!