bug fixing started