minor updates and bug fixes