minor updates and fixes