update to fix bugs