updating and fixing of bugs