some unimportant changes and fixes