fix bugs and updates