little changes and fixes