some minor updates and fixes