several minor updates and fixes