Bug fixing and updates