minor updates to fix bugs