updates to fix bugs